bitkeeper revision 1.213 (3eb9380dNpLXADof1Q707oFNYvY31Q)

Add flag -a for extra root params.

diff --git a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
index 1dd915686ed709db84dfaeae8c63069829664582..3181515df549eb0d10125d16b16de7e3ce203a27 100644 (file)
--- a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
+++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
@@ -13,7 +13,7 @@ public class CommandNew extends Command
     String image = getStringParameter(args, 'i', d.domainImage);
     String initrd = getStringParameter (args, 'r', d.domainInitRD);
     int vifs = getIntParameter(args, 'v', d.domainVIFs);
-    String bargs = getStringParameter (args, 'a', "");
+    String bargs = getStringParameter (args, 'a', d.args);
     String root_dev = getStringParameter (args, 'd', d.rootDevice);
     String nfs_root_path = getStringParameter (args, 'f', d.NWNFSRoot);
     String nw_ip = getStringParameter (args, '4', d.NWIP);
@@ -62,8 +62,7 @@ public class CommandNew extends Command
        }
        
        /* Set up boot parameters to pass to xi_build. */
-       bargs = "";
-
+        bargs += " ";
        if (root_dev.equals ("/dev/nfs")) {
          if (vifs == 0) {
            return reportError ("Cannot use NFS root without VIFs configured");

diff --git a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
index bacce11a952354b98e0a01fd53e5b087892cbde0..d30e941e5acd071b697672e254e4e2fa6e4986ae 100644 (file)
--- a/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
+++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
@@ -26,6 +26,8 @@ public class Defaults
 
   int MaxDomainNumber;
 
+  String args = "";
+
   String XIToolsDir;
 
   /***********************************************************************/
@@ -65,6 +67,7 @@ public class Defaults
     System.out.println ("   NWNFSServer " + NWNFSServer);
     System.out.println ("   NWNFSRoot " + NWNFSRoot);
     System.out.println ("   XIToolsDir " + XIToolsDir);
+    System.out.println ("   args " + args);
   }
 
   /***********************************************************************/
@@ -129,6 +132,8 @@ public class Defaults
            NWNFSServer = s;
          } else if (lastName.equals ("nw_nfs_root")) {
            NWNFSRoot = s;
+         } else if (lastName.equals ("args")) {
+           args = s;
          } else if (lastName.equals ("max_domain_number")) {
            MaxDomainNumber = Integer.parseInt(s);
          } else if (lastName.equals ("xi_tools_dir")) {